projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 37b8213 936a8f3)
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Fri, 16 Nov 2018 16:30:20 +0000 (08:30 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 16 Nov 2018 16:30:20 +0000 (08:30 -0800)
commit644a308b4e1513e04be9360e1586e14b32ec0159
tree97829ca478e3eb4469975852794189e4da726d68tree | snapshot
parent37b8213afda3550cb84c09b5718a019f2799bc8acommit | diff
parent936a8f3093f53442bb759880c8cddd5f4eb539a5commit | diff
Merge from origin/emacs-26

936a8f3 (origin/emacs-26) Document Emacs 26 behavior of Dired's 'Z' o...
99f99a1 ; Minor editing change in windows.texi
13bb665 Fix a typo in the Emacs manual

# Conflicts:
# etc/NEWS
doc/emacs/dired.texi diff1 | diff2 | blob | history
doc/emacs/rmail.texi diff1 | diff2 | blob | history
doc/emacs/windows.texi diff1 | diff2 | blob | history
etc/NEWS.26 diff1 | | blob | history
Unnamed repository; edit this file 'description' to name the repository.